| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | # -*- coding: utf-8 -*- | 
| 2 | 2 |  | 
| 3 | 3 | from django.conf.urls import url | 
| 4 | +from django_file_download import views as file_download_views | |
| 4 | 5 |  | 
| 5 | 6 | from account import account_views, tourguide_views | 
| 6 | 7 | from api import encrypt_views, mch_views | 
| @@ -205,3 +206,7 @@ urlpatterns += [ | ||
| 205 | 206 | urlpatterns += [ | 
| 206 | 207 | url(r'^api/consumer_info$', mch_views.consumer_info_api, name='consumer_info_api'), | 
| 207 | 208 | ] | 
| 209 | + | |
| 210 | +urlpatterns += [ | |
| 211 | + url(r'^f/download$', file_download_views.file_download, name='file_download'), | |
| 212 | +] | 
| @@ -44,6 +44,7 @@ INSTALLED_APPS = ( | ||
| 44 | 44 | 'django.contrib.messages', | 
| 45 | 45 | 'django.contrib.staticfiles', | 
| 46 | 46 | 'rest_framework', | 
| 47 | + 'django_file_download', | |
| 47 | 48 | 'django_uniapi', | 
| 48 | 49 | 'django_admin', | 
| 49 | 50 | 'django_rlog', | 
| @@ -353,7 +354,11 @@ MANAGERS = ADMINS | ||
| 353 | 354 | EMAIL_SUBJECT_PREFIX = u'[Pai2] ' | 
| 354 | 355 |  | 
| 355 | 356 | # Django-Admin Settings | 
| 356 | -DISABLE_ACTION = False | |
| 357 | +DJANGO_ADMIN_DISABLE_DELETE_SELECTED = False | |
| 358 | + | |
| 359 | +# Django-File Settings | |
| 360 | +DJANGO_FILE_DOWNLOAD_BASE_PATH = 'dfile' | |
| 361 | +DJANGO_FILE_DOWNLOAD_USE_YM = True | |
| 357 | 362 |  | 
| 358 | 363 | # Django-Logit Settings | 
| 359 | 364 | DJANGO_LOGIT_ENABLED = True | 
| @@ -403,14 +408,6 @@ Q_CLUSTER = { | ||
| 403 | 408 | 'redis_conn': REDIS_CACHE, | 
| 404 | 409 | } | 
| 405 | 410 |  | 
| 406 | -DJLOGIT = { | |
| 407 | - 'level': 'DEBUG', | |
| 408 | - 'class': 'rlog.RedisListHandler', | |
| 409 | - 'redis_client': REDIS_CACHE, | |
| 410 | - 'key': 'django:logit:pai2', | |
| 411 | - 'formatter': 'verbose', | |
| 412 | -} | |
| 413 | - | |
| 414 | 411 | # 日志设置 | 
| 415 | 412 |  LOGGING = { | 
| 416 | 413 | 'version': 1, | 
| @@ -424,7 +421,13 @@ LOGGING = { | ||
| 424 | 421 | }, | 
| 425 | 422 | }, | 
| 426 | 423 |      'handlers': { | 
| 427 | - 'logit': DJLOGIT, | |
| 424 | +        'logit': { | |
| 425 | + 'level': 'DEBUG', | |
| 426 | + 'class': 'rlog.RedisListHandler', | |
| 427 | + 'redis_client': REDIS_CACHE, | |
| 428 | + 'key': 'django:logit:pai2', | |
| 429 | + 'formatter': 'verbose', | |
| 430 | + }, | |
| 428 | 431 |          'console': { | 
| 429 | 432 | 'level': 'DEBUG', | 
| 430 | 433 | 'class': 'logging.StreamHandler', | 
| @@ -8,6 +8,7 @@ cryptography==1.5.2 | ||
| 8 | 8 | django-admin==1.2.6 | 
| 9 | 9 | django-curtail-uuid==1.0.4 | 
| 10 | 10 | django-detect==1.0.5 | 
| 11 | +django-file-download==1.0.0 | |
| 11 | 12 | django-file-md5==1.0.2 | 
| 12 | 13 | django-file-upload==1.0.5 | 
| 13 | 14 | django-ip==1.0.2 |